Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 11 Aug 2005 20:38:44 +0000 (12:38 -0800)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 11 Aug 2005 20:38:44 +0000 (12:38 -0800)
1  2 
xen/arch/x86/domain.c

Simple merge